auto merge of #974 : alexcrichton/cargo/issue-940, r=wycats
authorbors <bors@rust-lang.org>
Tue, 25 Nov 2014 17:44:19 +0000 (17:44 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Nov 2014 17:44:19 +0000 (17:44 +0000)
commit641c5c2c1fcf98e38490c7b45ff81ce652f6658b
treee1d299fd37e3a7d4e4a602c90923ba22cac5da3c
parentf936f3543fd1d4f2101cd937a4f52ce9f9676eae
parent5acb5f567b2f81f727ffd7be12e8f1a689c198bc
auto merge of #974 : alexcrichton/cargo/issue-940, r=wycats

This key will support projects with nonstandard licenses and the registry will
display the license as "nonstandard".

Closes #940